Add JUnit summaries to CircleCI as well as merged runs #3704
Conversation
|
Accompanying change: matrix-org/sytest#485 |
.circleci/merge_base_branch.sh
Outdated
| @@ -0,0 +1,22 @@ | |||
| echo 'export CIRCLE_PR_NUMBER="${CIRCLE_PR_NUMBER:-${CIRCLE_PULL_REQUEST##*/}}"' >> $BASH_ENV | |||
There was a problem hiding this comment.
shebang / comment / set -e, please
.circleci/merge_base_branch.sh
Outdated
| git fetch -u origin ${FETCH_REFS} | ||
|
|
||
| # Checkout PR merge ref. | ||
| git checkout -qf "pr/${CIRCLE_PR_NUMBER}/merge" |
There was a problem hiding this comment.
I think that conflicting PRs don't get a /merge ref, so this will fail, and the next command is a bit strange. what is your thinking here?
There was a problem hiding this comment.
I have no idea -- to be honest, this is just cargo culting. I haven't had any luck finding ANY documentation on the /merge ref, or the pr/ refset at all on GitHub -- my google-fu has failed me unfortunately. This is just the method that was recommended on the CircleCI forums (because Circle doesn't have a "merge before run" functionality like Travis).
.circleci/merge_base_branch.sh
Outdated
| git checkout -qf "pr/${CIRCLE_PR_NUMBER}/merge" | ||
|
|
||
| # Test for merge conflicts. | ||
| git branch --merged | grep "pr/${CIRCLE_PR_NUMBER}/head" > /dev/null |
There was a problem hiding this comment.
So a comment to explain how this works is going to be necessary. I think this works by:
- The git checkout above will fail if there is no merge branch, and so we'll bail out due to
set -e - If it does exist,
git branch --mergedwill list all branches that are merged into it. The grep will succeed ifpr/.../headbranch is merged into it, and fail if it isn't (and therefore bail out). - If
pr/../headis merged in then that meanspr/../mergemust be an up to date merge commit, and so we're done.
.circleci/merge_base_branch.sh
Outdated
| # Test for merge conflicts. | ||
| git branch --merged | grep "pr/${CIRCLE_PR_NUMBER}/head" > /dev/null | ||
|
|
||
| fi |
There was a problem hiding this comment.
If we can't find a CIRCLE_PR_NUMBER then we should probably bail out, rather than pretending we succeeded doing a merge build
There was a problem hiding this comment.
we'll bail out upwards (we check if CIRCLE_PR_NUMBER is defined)
There was a problem hiding this comment.
Then why do we have an if guard?
There was a problem hiding this comment.
because it also runs on master/develop
There was a problem hiding this comment.
oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooh
There was a problem hiding this comment.
Comment maybe for us slow people at the back? 0:-)
Features -------- - Python 3.5 and 3.6 support is now in beta. ([\#3576](#3576)) - Implement `event_format` filter param in `/sync` ([\#3790](#3790)) - Add synapse_admin_mau:registered_reserved_users metric to expose number of real reaserved users ([\#3846](#3846)) Bugfixes -------- - Remove connection ID for replication prometheus metrics, as it creates a large number of new series. ([\#3788](#3788)) - guest users should not be part of mau total ([\#3800](#3800)) - Bump dependency on pyopenssl 16.x, to avoid incompatibility with recent Twisted. ([\#3804](#3804)) - Fix existing room tags not coming down sync when joining a room ([\#3810](#3810)) - Fix jwt import check ([\#3824](#3824)) - fix VOIP crashes under Python 3 (#3821) ([\#3835](#3835)) - Fix manhole so that it works with latest openssh clients ([\#3841](#3841)) - Fix outbound requests occasionally wedging, which can result in federation breaking between servers. ([\#3845](#3845)) - Show heroes if room name/canonical alias has been deleted ([\#3851](#3851)) - Fix handling of redacted events from federation ([\#3859](#3859)) - ([\#3874](#3874)) - Mitigate outbound federation randomly becoming wedged ([\#3875](#3875)) Internal Changes ---------------- - CircleCI tests now run on the potential merge of a PR. ([\#3704](#3704)) - http/ is now ported to Python 3. ([\#3771](#3771)) - Improve human readable error messages for threepid registration/account update ([\#3789](#3789)) - Make /sync slightly faster by avoiding needless copies ([\#3795](#3795)) - handlers/ is now ported to Python 3. ([\#3803](#3803)) - Limit the number of PDUs/EDUs per federation transaction ([\#3805](#3805)) - Only start postgres instance for postgres tests on Travis CI ([\#3806](#3806)) - tests/ is now ported to Python 3. ([\#3808](#3808)) - crypto/ is now ported to Python 3. ([\#3822](#3822)) - rest/ is now ported to Python 3. ([\#3823](#3823)) - add some logging for the keyring queue ([\#3826](#3826)) - speed up lazy loading by 2-3x ([\#3827](#3827)) - Improved Dockerfile to remove build requirements after building reducing the image size. ([\#3834](#3834)) - Disable lazy loading for incremental syncs for now ([\#3840](#3840)) - federation/ is now ported to Python 3. ([\#3847](#3847)) - Log when we retry outbound requests ([\#3853](#3853)) - Removed some excess logging messages. ([\#3855](#3855)) - Speed up purge history for rooms that have been previously purged ([\#3856](#3856)) - Refactor some HTTP timeout code. ([\#3857](#3857)) - Fix running merged builds on CircleCI ([\#3858](#3858)) - Fix typo in replication stream exception. ([\#3860](#3860)) - Add in flight real time metrics for Measure blocks ([\#3871](#3871)) - Disable buffering and automatic retrying in treq requests to prevent timeouts. ([\#3872](#3872)) - mention jemalloc in the README ([\#3877](#3877)) - Remove unmaintained "nuke-room-from-db.sh" script ([\#3888](#3888))
No description provided.